Replace upload. Test green, still some bugs and design issues.