Improved some of the class mechanics. Need to implement a network message for handling.