WIP trying to get step over working