8 Commits (feature/serialization)