Closes #1 - extension.Core to core