Param filter

rebased dev branch, pushed to include param filters.