First commit of working app