Nick O: Merged an external gae module into the base one