master: add a few more lines of madness