Added some macros and stuff, man