Modified Everything to send Options properly to database