more work, i made some commands work