Add most models, initial schema design