Added DB, first draft, many things not working yet, just commented out.