Revert "derp"

This reverts commit 62f41df03ce97c596abda36eda59c95b96aa7170.
Revert "Uodated some stuff"

This reverts commit becddaaa4005e6e54794d785bdab2903c573459c.