Initial commit and working version