Added some stuff, working towards gettignn other stuff fixed