Fixing some option logic, dirty but works now
Passing in options when calling other commands