In prep for testing, having debug output in place