complete overhaul.... woot!