Basic updates before I move WalkerMain and WalkerActive into one class