In the middle of adding own options properly in the UI