Added TODO blocks to be implemented at codingbeer session
Added comments