Revert "Revert "Revert "Everything working except Heroku"""

This reverts commit 63a761fb3d256033fa39c2b8359630d11824e697.