File lines

Split off from pull request 738