Overhaul

Getting closer to a new design.