Massive overhaul and changes