Sending stuff to merge

Changing propproj over to the correct things, adding the two extra credit things.