Big construction site, in the middle of tidying up interfaces and
making everything more reusable.