Added globalMacros and cleaned up code a little more so that I do not come off as a dummy