adding starters, renaming stuff