Tidied up the pins scaffold
Updated associations