Further work on getting stuff to work