Initial go at the data structure
more crap