Foreman (again)

@marcioj take a look