finished most of 2.2.4, starting project 2