Check if this should be a class