Consolidation

Including inaugural use of a new (blender) scraper from Grandy! Exceptional tool, mission accomplished