WIP Write preliminary rebaseStep; get things to compile
Implement rebase with WTW stuff
Add TODO