Started working on class System