added stuff from project 1