Fixed stupid class being in a funny spot and serialization being a pain in the ass.