Revert "Cleaned up closes #11"

This reverts commit 96cc8deabc71f107a88fca7a9395f9b871ab496d.