new commands, code reorg..