Tidy up
Add CommandPatch object layer