initial work in re-organizing data structures