Action implementation

Full version merge.