Query 1 and 2

Have not been tested, paliminary work