Added command and uh... stuff