More restructuring and CuddleArea calc begun