Initial commit for working version