WIP on testing.  Not working yet.