Non live commit

Commiting for early collaboration