big commit, resuming using git properly.