Started adding Extension Modules to reduce code repeated between

problems.