back into a class, stop being lazy nick