in progress. Adding portfolio filtering