typo mixin now handling alts; consolidations, name changes
changed a bunch of names in prep for test suite
working query-from-to and query-for