trying to restructure things...