Just starting to scratch the surface

WIP - do not merge.