Added vars

Aaaand, I'm done refactoring.