First commit of base app