Let's stick with this interface as Justin suggested, can you add the explicit `nil` check though?