Modified 'source' of common files. Added section TODO.