prepping for MAJOR 'surgery'. we might need to roll back this to this commit or the one before this if things get too out of hand