Expand state saving. receive patronage, alloc
remove test running code