Mostly complete! Rereading and adding miscellaneous details