finished Error Message & Screen change TODOs