Some viewports.

It`s going hard to maintain (and merge) two branches, so we should merge this into master now.