Updates to simplerun from v2.0001 branch, multi-db beginnings.