Added a class to see if this works