Moves for refactor
Finish refactor of Options