On-The-Go mode [2/2]

Thanks Evisceration for the initial code.