Added some stuff, not fully working yet