First commit, have everything up to GAs done