Parking this here for a restart.
Cleanup for restart of the project.