Final setup for Milestone 1