Changed calculation system slightly, first steps for option dialog (backend working, all the options have yet to be put on the ui)