(Ross) seperated out functionalites, added that