Working through apps, adding filtering support

Not complete yet.