Work on Config.  Also added database and entity model.