New serialized merged into code base

Broke a lot of stuff too.