Queries 1a, 1b and 2a
Query 2A working hopefully
Query 2b looks alright