Work on #13 and #18

Still some bugs to squash before issues can be closed.