Feature.

Initial attempt to add origin tag suport.