add versionnumber to match-model
migration
(refac) use match model all over the bases