Bug fixes... refactored classes are working!!!