change the database to make a surver
added template files
merged
stash?