changes to FFG - better Command.py structure