Lot more changes, now it passes the fixtures
some progress
Return value fixed