Added some stuff, not done yet