Added some missing files, more bits of new api in place