Added grid filter - still need to test it -  it's drawing funky