first pass at 2.10.2
WIP on 2.10.2