making some progress on refactor