Add --watch option
Streamline skeleton