this whole method needs to go!!!