Resolving some 'TODO' in Introduction Chapter