Latest changes now beginning to add database.