Added some stuff i forgot but i need to commit before leaving