Version 4.0

Redone with new display class