WIP got --help working again