final changes gogogo

Did some stuff to make it work.

They now go.