CSCI-E15 project 2