Added and cleaned up Pins scaffold