Track my own espmartin/frameworks_base wip branch