Uploaded updated version. Some things still don't work