Add additional logging, remove TODO with version detection.   TODO, do something with the version detection