Project 1 parts 1-2 complete