Goal building - second step (specially for @leskald)

 

v20240901