Finish first version (ToDo Add Months)