Started to add options

Didn't have much time