WIP change to JCommander