add more querying and such