New code queries and code query annotations.
Added some test code