Started working on class and hook