Massive overhaul and update to 1.6.2