Fill-up the new branch with files

A working solution for appengine