Filtering working

commit 99dfedc0a3b2af4262b3d26f49aecdd7b835596e
Author: Michael Marconi <michael@modeltwozero.com>
Date:   Wed Jul 31 16:09:42 2013 +0100

    Filtering working at last!

commit 3c65fcd927f426f6aee69987459a6733e67ec4d6
Author: Michael Marconi <michael@modeltwozero.com>
Date:   Tue Jul 30 14:37:14 2013 +0100

    WIP