upgrader (with some work left to do)