moved a bunch of stuff to either the lifter or meet model