moving some of this stuff out of here