Got layout back, going to merge to core in a second