This should be all the updated code. Fuck Git if it isn't. FUCK IT