rearranged manage, preparing for future features