Pull in assets

I'm sick of working on a completely unrelated feature in a different branch. It's just getting annoying.