Updated project to reflect current state