Set up class and method
Fixed merge conflicts