More WIP. I don't really know where I'm going.