swapped order of definition
added todo notes
updated watch version
reduced complexity