Added system to detect annotations and use them

Untested but then again the entire registration system is so...