merging to master. template wizard is in there now. whew.