Revamping to get serialization to work correctly, as well as record properly.

Signed-off-by: William Raiford <bill.mybiz@gmail.com>