WIP Implement options