WIP: Updated fitting, plotting to work with refactored models