Commit

Is this a bug?

I don't think it's a bug per se, but it might need some more finetuning. Tagging /dev/null's amazing AI lab so she might look into it when she gets the time @paulinevos