Commenting out hte borked pieces for now.