separate increment and rewrite key listeners and WIP Find-Surface
refactor
refactor
WIP surface transform