Made interface into class