Added most core functions