Moving unfinished CDAWeb code