Pretty much rewriting commands
I don't remember if this actually works or not
I just need this commited