Cleaning up
Moved cross-domain call to command, refactoring