Add sender functionallity
Fix some problems