Gh 1080

Testing and all the tweaks are (hopefully) all done for this ticket.  It's tested and ready to merge.