Send and retrieve
update tests
add comments