compare style integrated with data
resolved conflicts
animations and all that cool jazz