test against save, not o2r
clean up stubs
remove unnnecessary code
implement semantic_key