Send form update 2

@ekala -- fixed issue with send, but needs review/test