Added in options, fixed asserions, and everything is shiny