yaiba | Finally a new clean branch

There we go...