Update to reflect pieces of project