Changed the Query and added IQuery to allow for better integration of basic controls with queryable controls.

Also a little testing about how to add links to a page. It seems that the dynamic link adding is redundent and needs to change towards a more attribute enabled approch.