Pushing up code for progress on issue #82