Refactored View Controller fixes into Macros! :D