[WIP] Add Configuration Options