Working on test 2 of 4 planned. Fixed several bugs along the way.