Closes #2 and #5