Major Overhaul, ready for testing drivers

…hopefully