got some stuff working, changed up some stuff