Finished(?) migrating UIBundle to CoreBundle...