Huge commit, restoring from final submission