Was making this all needlessly complex.
Also improved help.