Refactor code. Start experiments with extending/decorating bare value types (ADTs)