I've been working on a branch-- I will finish it tomorrow and merge it
with the master (this is for  Srpint #4).