WIP: testing of verse, some changes in model