Improving exception handling
Adding TODO's to code