finally redoing this, hold on a bit.