Temporary commit to allow John to take a look at the design.