Bug fixes; builds now. Start of 'choose a DB' cmake config