Implemeting #19, need to test it actually works