Milestone 2 & Finalization