Somehow I managed to send this to devel twice, when I meant to send it 
to discuss once xD