Cleaned up Pins scaffold v2