I merged some stuff, here's what I got.