Upload 5

WIP, but want to get template changes in to avoid conflicts