most functionality working now