Join table & migration
Loading friends and stuff
Fixed merge