v2 added model logic impro + migration
models working