Initial work on issues #2, #3, #4, and #5. Time to test