Work in progress
Improve signal interruption support.
Add 'prepare' command