Revert "Revert "Everything working except Heroku""

This reverts commit 0f0ce790a0d27355c456004201b2ecb58d99b61c.