Back-end starting to come together. Need to fix options validation