TODO's + Exception Handling