Gaaah, messed up the class...