Still a lot of annoying serialization bugs - branch commit before trying
Commit to keep up to date