Little progress and experiments...db changes too