initial commit

On branch master
fixed action locks
general commit