Add some test code and work in progress so far.