Work on model (tbc)

Signed-off-by: harringr@iascaigh <richieharrington@ymail.com>