Added macros and started class