Tmp commit; added annotations and metrics component structure.