Updated associations
Refactored
Got model show functioning
Added edit