Added TODO feauture

This is what I was talking about in #2