starting to restructure things