Pattern Overhaul

Prepping for pattern work.