everything is basically working now