Implementing a new screen still a w.i.p.