Added Area functionality fully!