Preparing for next development iteration
Added TODOs