Almost have the core data struct built.

Still not really happy with it, and this is just the base part of the
final structure.