Started adding seperate classes..!