Adding more untested code, mostly for game