added rudimentary diplay, lots of refacto needed...