Added order and maybe other stuff

hopefully this works