Remove whitespace.
Test to expose bug.
Abstract from and to in the list controller.
Fix the non-resolve aspect of the bug.
Fix for the resolve aspect.
Remove debugging.
Merge branch 'feature/issue-31' into develop