Moved things around, added project 2 stuff