More shuffled phrases to fill in later

Removed and renamed some stuff, added some TODOs