Repurposing project - lots of changes

Seriously, way too many to list.