closes #49
patch 1
patch 2
patch 3
patch 4 because I'm a nub
Merge pull request #101 from Team-Delta/task-897

Task 897