I think the search result normalise function /might/ be working now
Working towards a far better method of swapping in and out sinks and sources
Mended some calls
Renamed mixins to be ext, short for extensions