most functionality working again