Revert "Revert "Fixed Kyles Shitty Code""

This reverts commit cdc0a533f44ae4de3903921d4872db5bddc1312a.
Balls