Significant refactor to try and make it easier to tell where we're hiding the content in the filter.
Major refactor of cakefile, trying to streamline.

I HAVE NO IDEA IF THIS WILL WORK :D