Added some more filter functionality and started working on grid optimisation. Also captured up to Shards of Alara