Refactoring displays work. Also, adding options processing.