Playing around with data structures. Trying to get everything into a
nice state that I feel I can extend from.