heroku ready
about to add switches