NTheEndAgain updates: CommandExecutor almost done