System Overhaul
Clean up