Massive overhaul to the system - first working draft!