Almost, will update the issue when I'm done testing