Should work for now, Core Mod in the FUTURE!