TODO updated to reflect latest changes