Hacks during lab testing.  Changes here need to be revisited; on the
development machine.  Now that we have multiple people working on this,
I need to be on a branch.