Completing work on #109

Testing is not complete, but the develop is.