Cleaning up from column changes
Adding a simple test program and harness