Need to test this code still, pushing so I can make a hotfix in another branch.