More model work.....
yet more model work