Fixed a bug with closed slots. Refactored some of the methods to remove the need to reference classes.