7/3/14: did a lot of re-factoring and cleaning up old tests and code.