Started sketching newmodel implementation. Too complex, lots of pain