further work on preparing gae support