Latest working build
Bug fixes and new dependencies
Fixed upload messaging
Fixed sort bugs