Marino

Marino RC1

Detailed a bit more and fixed the broken logic