I don't think I can get rid of many more macros