Calculateupdate1

I'm still adding error checking stuff, but this update has both the single run and batch run models / functions working