last commit before implementation of new Display/ button engine

WORKING BULD