Feature/annotate all the things