preparing for big restructure in case things go wrong