Yea, I agree. Will get those functions moved in a bit.