Ticket/34

resolves database/models being out of sync.