Made changes, screen writing almost cmplete