Closes #3 (has yet to be tested).