Mega commit of doom
Big commit.