Basically working now