it's starting to work now
some more tiny bits moved around