Milestone 2.4: Design