Refactor slightly, use more paths ahead of moving to line markers, get some fonts going.