Even more stuff

I have the worst git management ever.