Experimental curate replacement

The purpose of this branch is to experiment with a greater decoupled system.