making some progress on refactoring and updating...