Back to work

This commit closes #4, #5, #8, and #9