Queries should be close to good. Going to get actions working first though