continuing overhaul... i made a mess yesterday