Initial commit of Query4 - not working yet, but want to create some snapshots of code ;)