Fixed Ordering Rule
Area Refactor

Still needs interpolation handling