Changed results to being a class instead