Initial working version
Add options