WIP
Most of the individual options handled