Broke everything, massive overhaul