further migrations and models work