More work on pspace generation. Bitsets not working yet for some reason.