Implement adding and removing objects to each other. Add some more tests. There's some ugly coding in this lot for now but it works!