Started implementing options-functionality