starting with the code that works onheroku, adding recent features