diff --git a/docs/api.md b/docs/api.md
new file mode 100644
index 00000000..e4825e2d
--- /dev/null
+++ b/docs/api.md
@@ -0,0 +1,504 @@
+## ArduinoCloud Class (Base)
+
+### `ArduinoCloud (Class)`
+
+#### Description
+
+`ArduinoIoTCloud` is a class for interfacing with the Arduino IoT Cloud. It provides an interface for managing IoT Cloud connectivity, updating data, and handling events.
+
+Depending on what type of connection is used (TCP/LPWAN), either the `ArduinoIoTCloudTCP` or `ArduinoIoTCloudLPWAN` base classes are initialized. This specification is done in the Arduino IoT Cloud's "Thing" interface, and is reflected in the automatically generated `thingProperties.h` file. 
+
+The above classes are inherited from the `ArduinoIoTCloudClass` base class, with methods used depending on what connection is used.
+
+#### Syntax
+
+```
+ArduinoCloud.method()
+```
+
+### `push()`
+
+#### Description
+
+Pushes data to the IoT Cloud.
+
+#### Syntax
+
+```
+ArduinoCloud.push()
+```
+
+#### Parameters
+
+None.
+
+#### Returns
+
+Nothing.
+
+### `setTimestamp()`
+
+Sets a timestamp for a cloud variable.
+
+#### Syntax
+
+```
+ArduinoCloud.setTimestamp(cloudVariable, timestamp)
+```
+
+#### Parameters
+
+- `String` - property name
+- `unsigned long const` - timestamp
+
+
+### `getThingId()`
+
+Gets the Thing ID.
+
+#### Syntax
+
+```
+ArduinoCloud.getThingId()
+```
+
+#### Parameters
+None.
+
+#### Returns
+- `String` - Thing ID.
+
+### `setDeviceId()`
+
+Sets the Device ID.
+
+#### Syntax
+
+```
+ArduinoCloud.setDeviceId(deviceId)
+```
+
+#### Parameters
+
+- `String` - Device ID.
+
+### `getDeviceId()`
+
+Gets the Device ID.
+
+#### Syntax
+
+```
+ArduinoCloud.getDeviceId()
+```
+
+#### Parameters
+
+None
+
+#### Returns
+
+- `String` - Device ID.
+
+### `getConnection()`
+
+Gets the connection handler used.
+
+#### Syntax
+
+```
+ArduinoCloud.getConnection()
+```
+
+#### Parameters
+
+### `getInternalTime()`
+
+Gets the internal time.
+
+#### Syntax
+
+```
+ArduinoCloud.getInternalTime()
+```
+
+#### Parameters
+None.
+
+#### Returns
+- `unsigned long` - internal time
+
+### `getLocalTime()`
+
+Gets the local time (based on your time zone).
+
+#### Syntax
+
+```
+ArduinoCloud.getLocalTime()
+```
+
+#### Parameters
+None
+
+#### Returns
+- `unsigned long` - local time
+
+
+### `addCallback()`
+
+Adds a callback function for IoT Cloud events.
+
+#### Syntax
+
+```
+ArduinoCloud.addCallback(ArduinoIoTCloudEvent::CONNECT, doThisOnConnect);
+ArduinoCloud.addCallback(ArduinoIoTCloudEvent::SYNC, doThisOnSync);
+ArduinoCloud.addCallback(ArduinoIoTCloudEvent::DISCONNECT, doThisOnDisconnect);
+```
+
+#### Parameters
+- Event (CONNECT, SYNC, DISCONNECT)
+- Callback function
+
+#### Example 
+
+See the [ArduinoIoTCloud-Callbacks](https://github.com/arduino-libraries/ArduinoIoTCloud/blob/master/examples/ArduinoIoTCloud-Callbacks/ArduinoIoTCloud-Callbacks.ino) example.
+
+<!-- TCP documentation begins here -->
+
+## ArduinoCloud Class (TCP)
+
+### `begin()` (TCP)
+
+#### Description
+
+Initialises the library with the connection handler specified in `thingProperties.h`. This is automatically generated based on the type of device.
+
+#### Syntax
+
+```
+ArduinoCloud.begin()
+```
+
+#### Parameters
+
+The `ArduinoIoTPreferredConnection` object is created automatically inside a `thingProperties.h` file when configuring a Thing and depends on what type of device you use. The connection handler classes are not part of the Arduino IoT Cloud, but exists inside the [Arduino_ConnectionHandler](https://github.com/arduino-libraries/Arduino_ConnectionHandler) library (listed as a dependency).
+
+For example, using the `WiFiConnectionHandler`, we use the `SSID`, `PASS` parameters which are defined in the `arduino_secrets.h` file, also generated based on what you input in the Arduino IoT Cloud interface.
+
+```
+WiFiConnectionHandler ArduinoIoTPreferredConnection(SSID, PASS);
+```
+
+#### Returns
+Nothing.
+
+### `update()` (TCP)
+
+#### Description
+
+**Note:** for LoRa devices, the `update()` function is implemented differently. See 
+
+Responsible for updating the IoT Cloud connection. 
+- First it feeds a watchdog timer, making sure it is not stuck anywhere,
+- then sends variable updates to the IoT Cloud (via MQTT client)
+- finally, it checks for new data from the IoT Cloud (via the MQTT client)
+
+Any IoT Cloud sketch needs to continuously call the `update()` function, as it will otherwise time out and reset. The `update()` is by default placed inside of the `loop()`.
+
+**Note:** do not use the `delay()` function in the sketch, as the watchdog timer will cause the board to reset and attempt to reconnect.
+
+#### Syntax
+
+```
+ArduinoCloud.update()
+```
+
+#### Parameters
+None.
+
+#### Returns
+Nothing.
+
+
+### `connected()` (TCP)
+
+#### Description
+
+Checks the connection status and returns an integer the connection status (int).
+
+#### Syntax
+
+```
+ArduinoCloud.connected()
+```
+
+#### Parameters
+None.
+
+#### Returns
+- `int` - status of connection
+
+### `printDebugInfo()` (TCP)
+
+#### Description
+
+Print any available debug information.
+
+#### Parameters
+None
+
+#### Returns
+Nothing.
+
+### `addProperty()` (TCP)
+
+#### Description
+
+Adds a variable/property with a set of parameters. 
+
+#### Syntax
+```
+ArduinoCloud.addProperty(cloudVariable, tag, permission, policy, callbackFunction)
+```
+
+#### Parameters
+- `cloudVariable` - name of the variable/property.
+- `permission` - can either be `READ` / `WRITE` or `READWRITE`
+- `policy` - `ON_CHANGE` (whenever variable data changes) or `<seconds> * SECONDS`. `<seconds>` is specified in the Thing configuration.
+- `callBackFunction` - by default, a callback function is added to a variable with **WRITE** permissions. A variable called `test` will automatically be added as `onTestChange` which also is added to your sketch. 
+
+#### Returns
+Nothing.
+
+### `setBoardId()`
+
+#### Description
+
+This method is only enabled if you are using an ESP32/ESP8266 board, and sets the board/device id.
+
+Currently, the following official Arduino boards uses this method:
+- [Arduino UNO R4 WiFi](https://store.arduino.cc/products/uno-r4-wifi)
+- [Arduino Nano ESP32](https://store.arduino.cc/products/nano-esp32)
+
+#### Syntax
+
+```
+ArduinoCloud.setBoardId(DEVICE_LOGIN_NAME);
+```
+
+### `setSecretDeviceKey()`
+
+#### Description
+
+This method is only enabled if you are using an ESP32/ESP8266 based board, and sets the secret device key for the device. The secret key is only obtainable from the Arduino IoT Cloud during device configuration.
+
+#### Syntax
+
+```
+ArduinoCloud.setSecretDeviceKey(DEVICE_KEY);
+```
+
+### `getBrokerAddress()`
+
+#### Description
+
+Get the MQTT broker address used.
+
+#### Syntax
+
+```
+ArduinoCloud.getBrokerAddress()
+```
+
+#### Parameters
+None.
+
+#### Return
+- `String` - the MQTT broker address.
+
+### `getBrokerPort()`
+
+#### Description
+
+Get the MQTT broker port used.
+
+#### Syntax
+
+```
+ArduinoCloud.getBrokerPort()
+```
+
+#### Parameters
+None.
+
+#### Return
+- `int` - the MQTT broker port.
+
+<!-- LPWAN documentation begins here -->
+
+## ArduinoCloud Class (LPWAN)
+
+### `begin()` (LPWAN)
+
+### Description
+This function initializes the ArduinoIoTCloudLPWAN library with the specified connection handler and retry settings.
+
+#### Parameters
+- `ConnectionHandler` - object containing `APPEUI`, `APPKEY` and frequency band (e.g. `_lora_band::EU868`)
+- `bool` - a boolean value that decides whether retry functionality is enabled (`true`) or disabled (`false`)
+
+#### Returns
+
+- `int` - returns `1` on successful initialization.
+
+### `update()` (LPWAN)
+
+#### Description
+
+This method handles the update between the board and the IoT Cloud.
+
+#### Syntax
+
+```
+ArduinoCloud.update()
+```
+
+#### Parameters
+None.
+
+#### Returns
+Nothing.
+
+
+### `connected()` (LPWAN)
+
+#### Description
+
+Checks the connection status and returns an integer the connection status (int).
+
+#### Syntax
+
+```
+ArduinoCloud.connected()
+```
+
+#### Parameters
+None.
+
+#### Returns
+- `int` - status of connection
+
+### `printDebugInfo()` (LPWAN)
+
+#### Description
+
+Print any available debug information.
+
+#### Parameters
+None.
+
+#### Returns
+Nothing.
+
+### `addProperty()` (LPWAN)
+
+#### Description
+
+Adds a variable/property with a set of parameters. 
+
+#### Syntax
+```
+ArduinoCloud.addProperty(cloudVariable, tag, permission, policy, callbackFunction)
+```
+
+#### Parameters
+- `cloudVariable` - name of the variable/property.
+- `permission` - can either be `READ` / `WRITE` or `READWRITE`
+- `tag` - matches the cloud and local variables with a number. E.g. adding a second variable will have the tag `2`.
+- `policy` - `ON_CHANGE` (whenever variable data changes) or `<seconds> * SECONDS`. `<seconds>` is specified in the Thing configuration.
+- `callBackFunction` - by default, a callback function is added to a variable with **WRITE** permissions. A variable called `test` will automatically be added as `onTestChange` which also is added to your sketch. 
+
+#### Returns
+Nothing.
+
+### `setThingId()`
+
+Sets the Thing ID.
+
+#### Syntax
+
+```
+ArduinoCloud.setThingId(thingId)
+```
+
+#### Parameters
+- `String` - your Thing's ID. Obtainable in the IoT Cloud interface. 
+
+
+### `isRetryEnabled()`
+
+#### Description
+This method is used to check whether retry functionality is enabled.
+
+#### Parameters
+None.
+
+#### Returns
+- `bool` - returns `true` if retry functionality is enabled, otherwise returns `false`.
+
+
+### `getMaxRetry()`
+
+#### Description
+This method is used to retrieve the maximum number of retry attempts.
+
+#### Parameters
+None.
+
+#### Returns
+- `int` - returns the maximum number of retry attempts as an integer.
+
+### `getIntervalRetry()`
+
+#### Description
+This method is used to retrieve the interval in milliseconds between the retry attempts.
+
+#### Parameters
+None.
+
+#### Returns
+- `long` - returns the interval between retry attempts in milliseconds. 
+
+### `enableRetry()`
+
+#### Description
+This method is used to enable or disable retry functionality.
+
+#### Parameters
+- `bool` - if `true`, retry functionality is enabled; if `false`, retry functionality is disabled.
+
+#### Returns
+Nothing.
+
+### `setMaxRetry()`
+
+Used to set the maximum number of retry attempts.
+
+#### Parameters
+- `int` - the maximum number of retry attempts to set.
+
+#### Returns
+Nothing.
+
+### `setIntervalRetry()`
+
+#### Description
+Sets the interval in milliseconds between retry attempts.
+
+#### Parameters
+- `long` - the interval between retry attempts in milliseconds to set.
+
+#### Returns
+Nothing.
\ No newline at end of file
diff --git a/docs/readme.md b/docs/readme.md
new file mode 100644
index 00000000..16c3cea7
--- /dev/null
+++ b/docs/readme.md
@@ -0,0 +1,36 @@
+# ArduinoIoTCloud
+
+The ArduinoIoTCloud library is the central element of the firmware enabling certain Arduino boards to connect to the [Arduino IoT Cloud](https://create.arduino.cc/iot/).
+
+- To get started, check out the [official documentation](https://docs.arduino.cc/arduino-cloud/)
+- For source code, check out the [GitHub repository](https://github.com/arduino-libraries/ArduinoIoTCloud)
+
+## thingProperties.h
+
+When you are create and configure a Thing in the [Arduino IoT Cloud interface](https://create.arduino.cc/iot/), the `thingProperties.h` file is generated automatically. 
+
+This file adds all the variable/properties along with its specifications (e.g. update policy, read/write permissions), and the type of connection handler depending on what device you have attached.
+
+Methods such as `addProperty()` and `setThingId()` are implemented here, so there's no need for manually entering anything.
+
+We recommend that **you do not edit this file** as it is automatically updating whenever you make changes in the Arduino IoT Cloud.
+
+### Offline Editing
+
+If you have set up your sketch in an offline environment, make sure that whatever changes you make are reflected in this file, as it will be updated in the online environment.
+
+## TCP / LPWAN
+
+Depending on what type of connection is used (TCP/LPWAN), either the `ArduinoIoTCloudTCP` or `ArduinoIoTCloudLPWAN` base classes are initialized. This specification is done in the Arduino IoT Cloud's "Thing" interface, and is reflected in the automatically generated `thingProperties.h` file.
+
+- If a board is configured as a **TCP** device, it will automatically include the `ArduinoIoTCloudTCP.h` file, and methods of the `ArduinoIoTCloudTCP` class will be made available. This is the most common option.
+- If a board is configured as an **LPWAN** device, it will instead include the `ArduinoIoTCloudLPWAN.h` file, and methods of the `ArduinoIoTCloudLPWAN` class will be made available. 
+
+As a result, functions such as `begin()`, `update()`, `connected()` and `printDebugInfo()` are documented under each corresponding class.
+
+## Connection Handler Library
+
+When the library is initialized via the `begin()` function, it will choose the specified **connection handler**, which is automatically added to your `thingProperties.h` file when configuring a Thing.
+
+The connection handler is done via another library, [Arduino_ConnectionHandler](https://github.com/arduino-libraries/Arduino_ConnectionHandler), which supports Wi-Fi®, GSM, NB-IoT, LoRa® & Ethernet.
+