tidying up
moved everything around to properly support multiple models. Note that the parameters set for the models is not finalised; they may need a little tweaking. However, things work AFAIK.