some of the display code added, ongoing from Tachist33