C&M done, except for animations