Made GAE ready... hopefully