Starting to separate display from internal representation