Week2 marembo final commit