Added some stuff, fixing some more. Unstable build