Milestone 3.1: Implementation