saving state on dashboard to prevent merge conflict - not finished yet