More functions into addons! March on! :palm_tree: