Small refactor
Completed handeling of options