Refactor away wrappers
Tidy up with test
Push down stop insertion