Started to make use of a common module.