Commented the code and added a TODO