refactor models back to math var names

Begin adding loops etc