1st commit

Basic working version
Remove unused occurrence.