More model work done, testing a new implementation on next push