Implemented options
First test passes, updating fails however