App tested 1st pass. More added