Fast and dirty hack solution: first step :) all tests passed!