Added join table and changed a bunch of stuff