Finalizing some cleanup operations and commiting the project too. This cleanup iteration isn't 100% done but the engine is running again