WIP: Finished off interface, fixing up actual options - not compiling