Lots of header work and updates to Options Framework