First commit - Integrated version

First commit - Integrated version