work up until triangle project 2