Made some variables actually mean something
Trying to fix Riley's issues