First commit of baseapp