Working on filters, and sorting. Commit temporary, must interrupt work for a couple of hours