Adding ActionCommander and currentUnit impl