Cleanup
Refactoring filters
Merge pull request #37 from postcode/oakland-staging

Oakland staging