Api changes

Closes #7 

@rcrichton if you could please review?
Should we not rather assert that this evaluates to null?