Start work on converters for serialization; adding annotations