got to a stopping point on refactoring data structures