Added send option, some class renaming
Commented.