This just changes some things from core-scaffold for the paper awesomeness