New annotations5

new annotations design ready to be merged to master and implemented. warning: will break functionality of old annotations