I'll strip this out and rebase after I'm done.