starting show page
maps work
uploading works
merge
mergin from sean