More dev/testing progress