trying to find the right structure / rearranging things