Merging both log and animation

Working so far.