Heath's first push
Added Heath's Display changes
rebasing from master cause john said so