more work on #6

All of the work for the shell version has been done and closes #6