Adding options for conversion to be more robust
Adding the new Options definition
Cleaning up some styling and making building drop into a bin