Adds basic macro parsing and formatting