very early pass at 3.1.0