catching up to speed, about to do some crazy changes