Add nil - more work WIP (not compiling)