Fix all the things I forgot about; add Companies and Members to loader
The rest is queries