Moo Take 3 :)

inc working tests