Fix formatting
Fix remaining tests
Move association stuff into model where it belongs
Don't put events in properties
Move collection to model
Remove properties