Final commit hacking session 15.12 by Toygamer