Thesis: expanded the hell out of everything