Put into a class, probably fucked things up.