Added some TODO items -> will rewrite webservice support to use JSON instead of XML.