Updated the plan and added some skeleton code