Add recursive -1, clean up indentations
Stub out watch test