Adding some staggered commits, I can't really remember what the purpose is.