Basic 716

Consolidated all sub and extension features into this module.