work in progress -- move the toy model into the main package