Completed this version of app and al tests