More WIP on Upw