V1

Gonna move this into master, I branched off the original master into original_dup