Worked on class and make macros