WIP - moving out option merging from parser