Big refactoring, working on senders api