Removed self, incorporated engine into classes