Seems to be it... Closes #5. Closes #6.