Commandline

Please pull for code review