Revert "Fixed up a lot + added a few new methods"

This reverts commit ff81e2a50702b23d85560ec6b7a2f2d0d41944e5.