Moved implementation of filtering over to filter drawer. Stuff works!