finally works!

need to clean up some stuff.