making progress on refactoring and updates