I think we should just dump this whole thing for now. When we start doing imports we can add in any data structures that we need.