finish massive overhaul, FUCK YES