First test passing
All tests passing
Cleaned up some comments
Refactored the datamodell to only have one collection. Fixes #16. Btw, this was the merge from ... well it took some time...