More work on getting the basics working with the forked version.