WIP: trying to get step mode working with correct logging