Final touches on project 2