First commit of working beta