I left this for the animations with marginal success. Likely a better approach here...