last working commit - almost finished app