Working on restoring early prototype functionality