Worked on list spring list handler, still not finished. Refactored API so that merging handlers can be changed.
Merged from master