Added in TODO for 0.7.1