padded out options, refactored a lot of the DB specific code. Ready for next jump