Reformatting.
Clean up the properties code a bit, hoping to find bug.
Begin setting up a test harness.
merge