ok, so I totally biffed this API. Test updates to follow