WIP: all non-logger switches done!