Full overhaul in progress

Nothing has been removed