Mid-way through debugging Issue #16

Know what the problem is now, just need to implement a solution.