This doesn't actually build. I have no idea what I'm doing
It... compiled
Got layout back, going to merge to core in a second