Trying to get everything working with Bijish's changes.  He had problems pushing, so I pushed for him and am now pulling his chabnges into my local, then pushing all back to github
Mergin my and Bijish work