Got the lines behaving how we'd prefer
Cleaned up a little thing
Merge remote-tracking branch 'origin/overlay' into overlay-integration