V_0.2.0b - Check comments for TODO and bugs