Basic command system and cpp fix.