Working on improving CFS, trying to add some wildcard routing to it.
Let's just merge this back into develop and work from there.
Merge branch 'improvedcfs' into develop