Infrastructure/extras inc to core

first pull request in the "extras and core " merger.