First commit: 2 days of work (8 hours in total)