Added comments for things that need to be done