Disregard last commit - formatted incorrectly. Previous commit closes #1 and closes #2.