Moved the class and cleaned up so mitchell can make it work