Tyrone cmd line

@nandsourav @mpln91 @chinmaywanpal @ruhavi 
Finally got all the changes merged. Very painful. git is not my friend.
Both sets of changes were needed for the runs.