Nearly complete; Refactored param names to match macros