Almost ready for primetime; config, improved logging, break into more files