Work in progress on single-database mode
Single database mode appears to be working