In progress
Big updates along with better upload / logging support