eneim/toro 11 commits

eneim/duppy 3 commits