include null keys

@darbyfrey @kylecrum @voxtex
I like this approach a lot better