Goal details merge

@mhahn @guymorita check it. we got rings that move.