Removed the todos and updated the main file