Merge with veox

Merged content with veox, now being merged with head.