Implemented TODO's