I lied the last two commits. Now I'm making it better.