Nullable types
Simplify WIP
Simplify + tests