Added comments for what needs to be done