Working project changes

Look all of the sexyness