switched to ndb + new app