got it mostly working
redoing stuff