Fucked up and fixed classes