Updates to Serializer and to TODOs.

Signed-off-by: sigilworks <tj@sigilworks.com>