Getting there.
Fix most of the queries
Merge branch 'working'
Adding notification fixes
More externalizers/factories