Closes #212 (not for appified yet)