First pass at Area changes
Fixing up Area stuff