changed format of app, mean too complicated
starting point