backing off 3.1 a bit to pass tests. work up from here