Cleanup and Prep

Just a few design cleanups and preps for custom connection string.