Uploading working

Uploading working, map removed, collision handling needs to be done in
future.