Resolved conflict
Attempted to implement but was unsuitable. Closes #12