Updated to CORE Framework

Untested and broken for now.