still working on FE redesign - adding logic