Revert making it a plugin. Testing complete. 100% Working