added some @TODO for 0.6 release