Rebase from original

Sorry if I'm doing this wrong, I'm new.