Overhauled entities. They should be easier to create based off subclasses now