Turned structs into classes and other stuff