Started adding type annotations