Closes #1 - tests for current functionality passing, new passing still WIP with failing tests