Fixed all of Dan's breakage