more progress. forget watchman