not pretty - somewhat functional
made it look more like the GAE version