Original hack with some docs and option parsing