Add organisation_id to progress form, remove unecessary param to model methods