4133: more WIP