User models and migrations

some simple mods and migs may need refactored