Milestone 3.1: Implementation

Screenshot of Design