Got rid of query components and added LOTS of examples