Renamed local namespace var to be more obvious
Fixed conflicts
Added custom config feature with tests, and a bit of a code reorganisation