Added TODO and test version of v0.5