More progress

I'm sorry my commit messages suck