ENH: Added solutions for alexnisnevich/untrusted