MAJOR OVERHAUL

This changes everything.