Add logging, finish rename, remove time on handler