Mass overhaul, first commit