stashing changes

working GAE copy