Extremely poor merge of current working frameworks/base

Reconcile when rom successfully boots