animated cups
mac build
merge