Adding more functinoality and transitions