Have been working

#1

in this message in a way for a couple more