Added Area and AreaContainer classes actually!