Got the state transfer working
Merged
Fixed messy merge