Animations work in progress
Resolve conditional class issues