initial checkin of project 2 changes