Improve some stuff
Go back to multiple queries
Fixup issues with new version of promises