Continue cleaning up code; get initial collection states and creation working