Add context based querying 20131004

Revamp query interface client to work with unary transformations