Finished adding and filling in the options and results structs. Renamed and split mapping bits into their own file.