Change association. has_many is now embedded
Position factory
Merges commits