spec stubs and doc stubs added, more work rewriting rest