initial commit
Nearly done at filtering feature