moved stuff around, using setup utils
added queries and updated docs