Start adding options struct