Added TODO.
Better deserializer layout/flow.