Beta release

Main task redone from scratch