redo the relationships
add some test stubs