lots of changes, trying to get stuff to work