Revert "Working on a lot of stuff"

This reverts commit ac6a0c44cb5e8158a7db42218ae01ed94bb995d0.