Safety commit. Current Task: Plugin refactoring. Almost done ffs.