Some more stuff now using the logger