Add some more work to the basic infrastructure / architecture.