Queries all tested. Scanner code is still funky.