Flesh out tap, more tests. Getting ready to move all the cmds to a utility module for stubbing.