finished pass at project 2