WIP: Visuals and geometry

With a rebase/merge Travis will catch these now, too :)