Move lessons to separate folder

Signed-off-by: Konstantin Aladyshev <aladyshev22@gmail.com>

21 files changed, 1104 insertions, 0 deletions

diff --git a/Lessons/Lesson_16/Conf/target.txt b/Lessons/Lesson_16/Conf/target.txt
new file mode 100644
index 0000000..c109dcf
--- /dev/null
+++ b/Lessons/Lesson_16/Conf/target.txt
@@ -0,0 +1,7 @@
+ACTIVE_PLATFORM       = UefiLessonsPkg/UefiLessonsPkg.dsc

+TARGET                = RELEASE

+TARGET_ARCH           = X64

+TOOL_CHAIN_CONF       = Conf/tools_def.txt

+TOOL_CHAIN_TAG        = GCC5

+BUILD_RULE_CONF = Conf/build_rule.txt

+

diff --git a/Lessons/Lesson_16/Ovmf.diff b/Lessons/Lesson_16/Ovmf.diff
new file mode 100644
index 0000000..01238c5
--- /dev/null
+++ b/Lessons/Lesson_16/Ovmf.diff
@@ -0,0 +1,59 @@
+diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
+index b0e9742937..840e6afa16 100644
+--- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
++++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
+@@ -1535,6 +1535,13 @@ PlatformBootManagerAfterConsole (
+     &gUefiShellFileGuid, L"EFI Internal Shell", LOAD_OPTION_ACTIVE

+     );

+ 

++  //

++  // Register HelloWorld app

++  //

++  PlatformRegisterFvBootOption (

++    &gHelloWorldFileGuid, L"Hello World", LOAD_OPTION_ACTIVE

++    );

++

+   RemoveStaleFvFileOptions ();

+   SetBootOrderFromQemu ();

+ 

+diff --git a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
+index e470b9a6a3..62ae7be761 100644
+--- a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
++++ b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
+@@ -33,6 +33,7 @@
+   OvmfPkg/OvmfPkg.dec

+   SecurityPkg/SecurityPkg.dec

+   ShellPkg/ShellPkg.dec

++  UefiLessonsPkg/UefiLessonsPkg.dec

+ 

+ [LibraryClasses]

+   BaseLib

+@@ -83,3 +84,4 @@
+   gEfiGlobalVariableGuid

+   gRootBridgesConnectedEventGroupGuid

+   gUefiShellFileGuid

++  gHelloWorldFileGuid

+diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
+index 0a237a9058..51eba5e225 100644
+--- a/OvmfPkg/OvmfPkgX64.dsc
++++ b/OvmfPkg/OvmfPkgX64.dsc
+@@ -951,6 +951,7 @@
+       gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

+       gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000

+   }

++  UefiLessonsPkg/HelloWorld/HelloWorld.inf

+ 

+ !if $(SECURE_BOOT_ENABLE) == TRUE

+   SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf

+diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
+index 5fa8c08958..ab4e021452 100644
+--- a/OvmfPkg/OvmfPkgX64.fdf
++++ b/OvmfPkg/OvmfPkgX64.fdf
+@@ -308,6 +308,7 @@ INF  ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf
+ INF  OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf

+ !endif

+ INF  ShellPkg/Application/Shell/Shell.inf

++INF  UefiLessonsPkg/HelloWorld/HelloWorld.inf

+ 

+ INF MdeModulePkg/Logo/LogoDxe.inf

+ 

diff --git a/Lessons/Lesson_16/README.md b/Lessons/Lesson_16/README.md
new file mode 100644
index 0000000..f983b52
--- /dev/null
+++ b/Lessons/Lesson_16/README.md
@@ -0,0 +1,286 @@
+In previous lesson we've developed an app that showed us current boot options:
+```
+FS0:\> ShowBootVariables.efi
+Boot0000
+UiApp
+Fv(7CB8BDC9-F8EB-4F34-AAEA-3EE4AF6516A1)/FvFile(462CAA21-7614-4503-836E-8AB6F4662331)
+
+Boot0001
+UEFI QEMU DVD-ROM QM00003
+PciRoot(0x0)/Pci(0x1,0x1)/Ata(0x0)
+
+Boot0002
+UEFI QEMU HARDDISK QM00001
+PciRoot(0x0)/Pci(0x1,0x1)/Ata(0x0)
+
+Boot0003*
+EFI Internal Shell
+Fv(7CB8BDC9-F8EB-4F34-AAEA-3EE4AF6516A1)/FvFile(7C04A583-9E3E-4F1C-AD65-E05268D0B4D1)
+
+Boot0004
+UEFI PXEv4 (MAC:525400123456)
+PciRoot(0x0)/Pci(0x3,0x0)/MAC(525400123456,0x1)/IPv4(0.0.0.0)
+```
+
+If you want to know information about the printed GUIDs here it is:
+- `FILE_GUID = 7C04A583-9E3E-4f1c-AD65-E05268D0B4D1 # gUefiShellFileGuid`
+https://github.com/tianocore/edk2/blob/master/ShellPkg/Application/Shell/Shell.inf
+- `FILE_GUID = 462CAA21-7614-4503-836E-8AB6F4662331` - UiApp module is driver for BDS phase
+https://github.com/tianocore/edk2/blob/master/MdeModulePkg/Application/UiApp/UiApp.inf
+
+As for the `7CB8BDC9-F8EB-4F34-AAEA-3EE4AF6516A1` it is a GUID for the firmware volume in our OVMF image.
+https://github.com/tianocore/edk2/blob/master/OvmfPkg/OvmfPkgX64.fdf
+
+This *.fdf file lists what drivers/apps are placed in every volume in the image (this includes volumes for SEC, PEI or DXE stages): 
+```
+...
+
+[FV.SECFV]
+FvNameGuid         = 763BED0D-DE9F-48F5-81F1-3E90E1B1A015
+BlockSize          = 0x1000
+FvAlignment        = 16
+...
+INF <...>
+...
+
+[FV.PEIFV]
+FvNameGuid         = 6938079B-B503-4E3D-9D24-B28337A25806
+BlockSize          = 0x10000
+FvAlignment        = 16
+...
+INF <...>
+...
+
+[FV.DXEFV]
+FvForceRebase      = FALSE
+FvNameGuid         = 7CB8BDC9-F8EB-4F34-AAEA-3EE4AF6516A1        ### <---- this is a GUID from our output
+BlockSize          = 0x10000
+FvAlignment        = 16
+...
+INF  ShellPkg/Application/Shell/Shell.inf          <--- this apps are placed in the FV.DXEFV firmware volume
+...
+INF  MdeModulePkg/Application/UiApp/UiApp.inf
+```
+
+For the complete edk2 FDF file specification look at the https://edk2-docs.gitbook.io/edk-ii-fdf-specification/
+
+If you look at the https://github.com/tianocore/edk2/blob/master/ShellPkg/Application/Shell/Shell.inf you'll see that EFI Shell is a simple `UEFI_APPLICATION`. We've developed a lot of those in these lessons, so let's try to add one of our apps to boot options.
+
+We will try to add our `HelloWorld` application to the boot options. We will look at how Shell app is included and try to do the same.
+
+First we need to add our app to OVMF image. So let's add `UefiLessonsPkg/HelloWorld/HelloWorld.inf` to the `[FV.DXEFV]` section next to `INF  ShellPkg/Application/Shell/Shell.inf` in a `OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf` we've already discussed.
+
+```
+[FV.DXEFV]
+FvForceRebase      = FALSE
+FvNameGuid         = 7CB8BDC9-F8EB-4F34-AAEA-3EE4AF6516A1
+BlockSize          = 0x10000
+FvAlignment        = 16
+...
+
+  INF  ShellPkg/Application/Shell/Shell.inf
++ INF  UefiLessonsPkg/HelloWorld/HelloWorld.inf
+...
+```
+
+If we try to build OVMF now we would get:
+```
+$ build --platform=OvmfPkg/OvmfPkgX64.dsc --arch=X64 --buildtarget=RELEASE --tagname=GCC5
+...
+build.py...
+ : error F001: Module /home/kostr/tiano/edk2/UefiLessonsPkg/HelloWorld/HelloWorld.inf NOT found in DSC file; Is it really a binary module?
+...
+```
+
+Ok, so we need to add information to the `OvmfPkg/OvmfPkgX64.dsc` file. If you look at this file, you'll see that `ShellPkg/Application/Shell/Shell.inf` is listed under `[Components]` section. We've already used it in our first lesson when we've tried to compile our app without package. Add `UefiLessonsPkg/HelloWorld/HelloWorld.inf` next to the Shell INF file.
+```
+[Components]
+  ...
+  ShellPkg/Application/Shell/Shell.inf {
+   ...
+  }
++ UefiLessonsPkg/HelloWorld/HelloWorld.inf
+  ...
+```
+Shell.inf file has some information inside the brackets `{...}`. Don't mind it, we don't need such info for our simple `HelloWorld.inf`.
+
+
+Now we can compile OVMF without errors:
+```
+$ build --platform=OvmfPkg/OvmfPkgX64.dsc --arch=X64 --buildtarget=RELEASE --tagname=GCC5
+```
+Our `HelloWorld` app would be compiled and embedded in the OVMF image but unfortunately in wouldn't be listed in a boot options.
+
+When we used our `ShowBootVariables.efi` app we saw that UEFI shell boot option had a description `EFI Internal Shell`. Let's try search for that in a edk2 codebase:
+```
+$ grep "EFI Internal Shell" -r ./ --exclude=Build
+./ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c:    &gUefiShellFileGuid, L"EFI Internal Shell", LOAD_OPTION_ACTIVE
+./OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c:    &gUefiShellFileGuid, L"EFI Internal Shell", LOAD_OPTION_ACTIVE
+./OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c:    &gUefiShellFileGuid, L"EFI Internal Shell", LOAD_OPTION_ACTIVE
+./OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c:    &gUefiShellFileGuid, L"EFI Internal Shell", LOAD_OPTION_ACTIVE
+```
+
+For our case we're interested in a `./OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c` file:
+```
+VOID
+EFIAPI
+PlatformBootManagerAfterConsole (
+  VOID
+  )
+{
+  ...
+  //
+  // Register UEFI Shell
+  //
+  PlatformRegisterFvBootOption (
+    &gUefiShellFileGuid, L"EFI Internal Shell", LOAD_OPTION_ACTIVE
+    );
+
+  ...
+}
+```
+If you grep for a `gUefiShellFileGuid`:
+```
+./OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c:    &gUefiShellFileGuid, L"EFI Internal Shell", LOAD_OPTION_ACTIVE
+./OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf:  gUefiShellFileGuid
+./ShellPkg/Application/Shell/Shell.inf:  FILE_GUID                      = 7C04A583-9E3E-4f1c-AD65-E05268D0B4D1 # gUefiShellFileGuid
+./ShellPkg/ShellPkg.dec:  gUefiShellFileGuid              = {0x7c04a583, 0x9e3e, 0x4f1c, {0xad, 0x65, 0xe0, 0x52, 0x68, 0xd0, 0xb4, 0xd1}}
+```
+
+Ok it looks like we need to create a `UefiLessonsPkg/UefiLessonsPkg.dec` file with something like `gHelloWorldFileGuid` with a value equal to the one that is listed in a `UefiLessonsPkg/HelloWorld/HelloWorld.inf` file.
+
+Let's do it:
+```
+[Defines]
+  DEC_SPECIFICATION              = 0x00010005
+  PACKAGE_NAME                   = UefiLessonsPkg
+  PACKAGE_GUID                   = 7e7edbba-ca2c-4177-a3f0-d3371358773a
+  PACKAGE_VERSION                = 1.01
+
+[Guids]
+  # FILE_GUID as defined in UefiLessonsPkg/HelloWorld/HelloWorld.inf
+  gHelloWorldFileGuid            = {0x2e55fa38, 0xf148, 0x42d3, {0xaf, 0x90, 0x1b, 0xe2, 0x47, 0x32, 0x3e, 0x30}}
+
+```
+EDK2 Package Declaration (DEC) File Format Specification can be found at link https://edk2-docs.gitbook.io/edk-ii-dec-specification/
+
+Let's add our GUID to the `OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf` file
+```
+[Guids]
+ ...
+  gUefiShellFileGuid
++ gHelloWorldFileGuid
+```
+So we could use it in a `OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c` file:
+```
+VOID
+EFIAPI
+PlatformBootManagerAfterConsole (
+  VOID
+  )
+{
+  ...
+  //
+  // Register UEFI Shell
+  //
+  PlatformRegisterFvBootOption (
+    &gUefiShellFileGuid, L"EFI Internal Shell", LOAD_OPTION_ACTIVE
+    );
+
+  //
+  // Register HelloWorld app
+  //
+  PlatformRegisterFvBootOption (
+    &gHelloWorldFileGuid, L"Hello World", LOAD_OPTION_ACTIVE
+    );
+  ...
+}
+```
+
+If we try to build OVMF now we would get an error:
+```
+$ build --platform=OvmfPkg/OvmfPkgX64.dsc --arch=X64 --buildtarget=RELEASE --tagname=GCC5
+...
+
+build.py...
+/home/kostr/tiano/edk2/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf(87): error 4000: Value of Guid [gHelloWorldFileGuid] is not found under [Guids] section in
+        /home/kostr/tiano/edk2/MdePkg/MdePkg.dec
+        /home/kostr/tiano/edk2/MdeModulePkg/MdeModulePkg.dec
+        /home/kostr/tiano/edk2/SourceLevelDebugPkg/SourceLevelDebugPkg.dec
+        /home/kostr/tiano/edk2/OvmfPkg/OvmfPkg.dec
+        /home/kostr/tiano/edk2/SecurityPkg/SecurityPkg.dec
+        /home/kostr/tiano/edk2/ShellPkg/ShellPkg.dec
+...
+```
+To correct in we need our newly created `UefiLessonsPkg/UefiLessonsPkg.dec` to the `OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf`:
+```
+[Packages]
+  ...
+  ShellPkg/ShellPkg.dec
+  UefiLessonsPkg/UefiLessonsPkg.dec
+```
+
+Finally we can successfully build OVMF. Let's run it and test our newly created boot option.
+
+Execute QEMU launch as usual. Now if you'll execute our `ShowBootVariables.efi` app you would get:
+```
+FS0:\> ShowBootVariables.efi
+Boot0000
+UiApp
+Fv(7CB8BDC9-F8EB-4F34-AAEA-3EE4AF6516A1)/FvFile(462CAA21-7614-4503-836E-8AB6F4662331)
+
+Boot0001
+UEFI QEMU DVD-ROM QM00003
+PciRoot(0x0)/Pci(0x1,0x1)/Ata(0x0)
+
+Boot0002
+UEFI QEMU HARDDISK QM00001
+PciRoot(0x0)/Pci(0x1,0x1)/Ata(0x0)
+
+Boot0003*
+EFI Internal Shell
+Fv(7CB8BDC9-F8EB-4F34-AAEA-3EE4AF6516A1)/FvFile(7C04A583-9E3E-4F1C-AD65-E05268D0B4D1)
+
+Boot0004
+Hello World
+Fv(7CB8BDC9-F8EB-4F34-AAEA-3EE4AF6516A1)/FvFile(2E55FA38-F148-42D3-AF90-1BE247323E30)
+
+Boot0005
+UEFI PXEv4 (MAC:525400123456)
+PciRoot(0x0)/Pci(0x3,0x0)/MAC(525400123456,0x1)/IPv4(0.0.0.0)
+```
+
+Hooraay! Our boot option is present in the system.
+
+UEFI shell has a command `bcfg` to print boot variables. You can check that the data from our app is correct, if you execute `bcfg boot dump`:
+```
+Shell> bcfg boot dump
+Option: 00. Variable: Boot0000
+  Desc    - UiApp
+  DevPath - Fv(7CB8BDC9-F8EB-4F34-AAEA-3EE4AF6516A1)/FvFile(462CAA21-7614-4503-836E-8AB6F4662331)
+  Optional- N
+Option: 01. Variable: Boot0001
+  Desc    - UEFI QEMU DVD-ROM QM00003
+  DevPath - PciRoot(0x0)/Pci(0x1,0x1)/Ata(0x0)
+  Optional- Y
+Option: 02. Variable: Boot0002
+  Desc    - UEFI QEMU HARDDISK QM00001
+  DevPath - PciRoot(0x0)/Pci(0x1,0x1)/Ata(0x0)
+  Optional- Y
+Shell>  03. Variable: Boot0003
+  Desc    - EFI Internal Shell
+  DevPath - Fv(7CB8BDC9-F8EB-4F34-AAEA-3EE4AF6516A1)/FvFile(7C04A583-9E3E-4F1C-AD65-E05268D0B4D1)
+  Optional- N
+Option: 04. Variable: Boot0004
+  Desc    - Hello World
+  DevPath - Fv(7CB8BDC9-F8EB-4F34-AAEA-3EE4AF6516A1)/FvFile(2E55FA38-F148-42D3-AF90-1BE247323E30)
+  Optional- N
+Option: 05. Variable: Boot0005
+  Desc    - UEFI PXEv4 (MAC:525400123456)
+  DevPath - PciRoot(0x0)/Pci(0x3,0x0)/MAC(525400123456,0x1)/IPv4(0.0.0.0)
+  Optional- Y
+```
+
+Just in case I've placed `Ovmf.diff` in this lesson folder that shows all the necessary changes.
+
+
diff --git a/Lessons/Lesson_16/UefiLessonsPkg/HelloWorld/HelloWorld.c b/Lessons/Lesson_16/UefiLessonsPkg/HelloWorld/HelloWorld.c
new file mode 100644
index 0000000..1f05899
--- /dev/null
+++ b/Lessons/Lesson_16/UefiLessonsPkg/HelloWorld/HelloWorld.c
@@ -0,0 +1,15 @@
+#include <Library/UefiBootServicesTableLib.h>
+#include <Library/UefiLib.h>
+
+EFI_STATUS
+EFIAPI
+UefiMain (
+  IN EFI_HANDLE        ImageHandle,
+  IN EFI_SYSTEM_TABLE  *SystemTable
+  )
+{
+  SystemTable->ConOut->OutputString(SystemTable->ConOut, L"Hello World!\n");
+  gST->ConOut->OutputString(gST->ConOut, L"Hello again!\n");
+  Print(L"Bye!\n");
+  return EFI_SUCCESS;
+}
diff --git a/Lessons/Lesson_16/UefiLessonsPkg/HelloWorld/HelloWorld.inf b/Lessons/Lesson_16/UefiLessonsPkg/HelloWorld/HelloWorld.inf
new file mode 100644
index 0000000..d65ca2e
--- /dev/null
+++ b/Lessons/Lesson_16/UefiLessonsPkg/HelloWorld/HelloWorld.inf
@@ -0,0 +1,18 @@
+[Defines]
+  INF_VERSION                    = 1.25
+  BASE_NAME                      = HelloWorld
+  FILE_GUID                      = 2e55fa38-f148-42d3-af90-1be247323e30
+  MODULE_TYPE                    = UEFI_APPLICATION
+  VERSION_STRING                 = 1.0
+  ENTRY_POINT                    = UefiMain
+
+[Sources]
+  HelloWorld.c
+
+[Packages]
+  MdePkg/MdePkg.dec
+
+[LibraryClasses]
+  UefiApplicationEntryPoint
+  UefiLib
+
diff --git a/Lessons/Lesson_16/UefiLessonsPkg/ImageHandle/ImageHandle.c b/Lessons/Lesson_16/UefiLessonsPkg/ImageHandle/ImageHandle.c
new file mode 100644
index 0000000..32e9c43
--- /dev/null
+++ b/Lessons/Lesson_16/UefiLessonsPkg/ImageHandle/ImageHandle.c
@@ -0,0 +1,105 @@
+#include <Library/MemoryAllocationLib.h>
+#include <Library/UefiBootServicesTableLib.h>
+#include <Library/UefiLib.h>
+
+typedef struct {
+  UINTN               Signature;
+  /// All handles list of IHANDLE
+  LIST_ENTRY          AllHandles;
+  /// List of PROTOCOL_INTERFACE's for this handle
+  LIST_ENTRY          Protocols;
+  UINTN               LocateRequest;
+  /// The Handle Database Key value when this handle was last created or modified
+  UINT64              Key;
+} IHANDLE;
+
+typedef struct {
+  UINTN               Signature;
+  /// Link Entry inserted to mProtocolDatabase
+  LIST_ENTRY          AllEntries;
+  /// ID of the protocol
+  EFI_GUID            ProtocolID;
+  /// All protocol interfaces
+  LIST_ENTRY          Protocols;
+  /// Registerd notification handlers
+  LIST_ENTRY          Notify;
+} PROTOCOL_ENTRY;
+
+typedef struct {
+  UINTN                       Signature;
+  /// Link on IHANDLE.Protocols
+  LIST_ENTRY                  Link;
+  /// Back pointer
+  IHANDLE                     *Handle;
+  /// Link on PROTOCOL_ENTRY.Protocols
+  LIST_ENTRY                  ByProtocol;
+  /// The protocol ID
+  PROTOCOL_ENTRY              *Protocol;
+  /// The interface value
+  VOID                        *Interface;
+  /// OPEN_PROTOCOL_DATA list
+  LIST_ENTRY                  OpenList;
+  UINTN                       OpenListCount;
+
+} PROTOCOL_INTERFACE;
+
+
+#define offsetof(a,b) ((INTN)(&(((a*)(0))->b)))
+
+#define container_of(ptr, type, member) ({                      \
+        const typeof( ((type *)0)->member ) *__mptr = (ptr);    \
+        (type *)( (char *)__mptr - offsetof(type,member) );})
+
+EFI_STATUS
+EFIAPI
+UefiMain (
+  IN EFI_HANDLE        ImageHandle,
+  IN EFI_SYSTEM_TABLE  *SystemTable
+  )
+{
+  IHANDLE* MyHandle = ImageHandle;
+  Print(L"Signature: %c %c %c %c\n", (MyHandle->Signature >>  0) & 0xff,
+                                     (MyHandle->Signature >>  8) & 0xff,
+                                     (MyHandle->Signature >> 16) & 0xff,
+                                     (MyHandle->Signature >> 24) & 0xff);
+
+  Print(L"Back Protocol Interface Link: %p\n", MyHandle->Protocols.BackLink);
+  Print(L"Forward Protocol Interface Link: %p\n", MyHandle->Protocols.ForwardLink);
+
+  LIST_ENTRY *FirstLink = MyHandle->Protocols.ForwardLink;
+  LIST_ENTRY *CurrentLink = FirstLink;
+  do {
+  	PROTOCOL_INTERFACE* MyProtocolInterface = container_of(CurrentLink, PROTOCOL_INTERFACE, Link);
+
+        Print(L"\n");
+        Print(L"Current Link: %p\n", CurrentLink);
+  	Print(L"Signature: %x %x %x %x\n", (MyProtocolInterface->Signature >>  0) & 0xff,
+        	                           (MyProtocolInterface->Signature >>  8) & 0xff,
+                	                   (MyProtocolInterface->Signature >> 16) & 0xff,
+                        	           (MyProtocolInterface->Signature >> 24) & 0xff);
+
+  	Print(L"Back Link: %p\n", MyProtocolInterface->Link.BackLink);
+	Print(L"Forward Link: %p\n", MyProtocolInterface->Link.ForwardLink);
+	Print(L"GUID=%g\n", MyProtocolInterface->Protocol->ProtocolID);
+        CurrentLink = MyProtocolInterface->Link.ForwardLink;
+  } while (CurrentLink != FirstLink);
+
+  Print(L"________\n");
+  EFI_GUID **ProtocolGuidArray;
+  UINTN ArrayCount;
+  //EFI_STATUS Status = gBS->ProtocolsPerHandle(NULL,		// Use this to test %r Print formatting option
+  EFI_STATUS Status = gBS->ProtocolsPerHandle(ImageHandle,
+					      &ProtocolGuidArray,
+					      &ArrayCount);
+
+  if (!EFI_ERROR(Status)) {
+    for (int i=0; i<ArrayCount; i++) {
+      Print(L"%g\n", ProtocolGuidArray[i]);
+    }
+    FreePool(ProtocolGuidArray);
+  } else {
+    Print(L"ProtocolsPerHandle error: %r\n", Status);
+  }
+
+  return EFI_SUCCESS;
+}
diff --git a/Lessons/Lesson_16/UefiLessonsPkg/ImageHandle/ImageHandle.inf b/Lessons/Lesson_16/UefiLessonsPkg/ImageHandle/ImageHandle.inf
new file mode 100644
index 0000000..34256ee
--- /dev/null
+++ b/Lessons/Lesson_16/UefiLessonsPkg/ImageHandle/ImageHandle.inf
@@ -0,0 +1,18 @@
+[Defines]
+  INF_VERSION                    = 1.25
+  BASE_NAME                      = ImageHandle
+  FILE_GUID                      = b68d3472-70c7-4928-841b-6566032e0a23
+  MODULE_TYPE                    = UEFI_APPLICATION
+  VERSION_STRING                 = 1.0
+  ENTRY_POINT                    = UefiMain
+
+[Sources]
+  ImageHandle.c
+
+[Packages]
+  MdePkg/MdePkg.dec
+
+[LibraryClasses]
+  UefiApplicationEntryPoint
+  UefiLib
+
diff --git a/Lessons/Lesson_16/UefiLessonsPkg/ImageInfo/ImageInfo.c b/Lessons/Lesson_16/UefiLessonsPkg/ImageInfo/ImageInfo.c
new file mode 100644
index 0000000..c45570e
--- /dev/null
+++ b/Lessons/Lesson_16/UefiLessonsPkg/ImageInfo/ImageInfo.c
@@ -0,0 +1,44 @@
+#include <Library/UefiBootServicesTableLib.h>
+#include <Library/UefiLib.h>
+
+#include <Protocol/LoadedImage.h>
+#include <Library/DevicePathLib.h>
+
+EFI_STATUS
+EFIAPI
+UefiMain (
+  IN EFI_HANDLE        ImageHandle,
+  IN EFI_SYSTEM_TABLE  *SystemTable
+  )
+{
+  EFI_STATUS Status;
+  EFI_LOADED_IMAGE_PROTOCOL* LoadedImage;
+
+  Status = gBS->HandleProtocol(
+    ImageHandle,
+    &gEfiLoadedImageProtocolGuid,
+    (VOID **) &LoadedImage
+  );
+
+  if (Status == EFI_SUCCESS) {
+    EFI_DEVICE_PATH_PROTOCOL* DevicePath;
+
+    Status = gBS->HandleProtocol(
+      ImageHandle,
+      &gEfiLoadedImageDevicePathProtocolGuid,
+      (VOID**) &DevicePath
+    );
+
+    if (Status == EFI_SUCCESS) {
+      Print(L"Image device: %s\n", ConvertDevicePathToText(DevicePath, FALSE, TRUE));
+      Print(L"Image file: %s\n",  ConvertDevicePathToText(LoadedImage->FilePath, FALSE, TRUE));	// EFI_DEVICE_PATH_PROTOCOL *FilePath
+      Print(L"Image Base: %X\n", LoadedImage->ImageBase);
+      Print(L"Image Size: %X\n", LoadedImage->ImageSize);
+    } else {
+      Print(L"Can't get EFI_LOADED_IMAGE_PROTOCOL, Status=%r\n", Status);
+    }
+  } else {
+    Print(L"Can't get EFI_DEVICE_PATH_PROTOCOL, Status=%r\n", Status);
+  }
+  return EFI_SUCCESS;
+}
diff --git a/Lessons/Lesson_16/UefiLessonsPkg/ImageInfo/ImageInfo.inf b/Lessons/Lesson_16/UefiLessonsPkg/ImageInfo/ImageInfo.inf
new file mode 100644
index 0000000..0ce54a6
--- /dev/null
+++ b/Lessons/Lesson_16/UefiLessonsPkg/ImageInfo/ImageInfo.inf
@@ -0,0 +1,22 @@
+[Defines]
+  INF_VERSION                    = 1.25
+  BASE_NAME                      = ImageInfo
+  FILE_GUID                      = b68d3472-70c7-4928-841b-6566032e0a23
+  MODULE_TYPE                    = UEFI_APPLICATION
+  VERSION_STRING                 = 1.0
+  ENTRY_POINT                    = UefiMain
+
+[Sources]
+  ImageInfo.c
+
+[Packages]
+  MdePkg/MdePkg.dec
+
+[LibraryClasses]
+  UefiApplicationEntryPoint
+  UefiLib
+
+[Protocols]
+  gEfiLoadedImageProtocolGuid
+  gEfiLoadedImageDevicePathProtocolGuid
+
diff --git a/Lessons/Lesson_16/UefiLessonsPkg/ListVariables/ListVariables.c b/Lessons/Lesson_16/UefiLessonsPkg/ListVariables/ListVariables.c
new file mode 100644
index 0000000..1f3ef4a
--- /dev/null
+++ b/Lessons/Lesson_16/UefiLessonsPkg/ListVariables/ListVariables.c
@@ -0,0 +1,46 @@
+#include <Library/UefiBootServicesTableLib.h>
+#include <Library/UefiLib.h>
+
+
+#include <Library/MemoryAllocationLib.h>
+#include <Library/UefiRuntimeServicesTableLib.h>
+
+INTN EFIAPI ShellAppMain(IN UINTN Argc, IN CHAR16 **Argv)
+{
+  EFI_GUID VendorGuid;
+  UINTN VariableNameSize = sizeof (CHAR16);
+  CHAR16* VariableName = AllocateZeroPool(sizeof(CHAR16));
+  if (VariableName == NULL) {
+    Print(L"Error on AllocateZeroPool call\n");
+    return EFI_OUT_OF_RESOURCES;
+  }
+
+  while (TRUE)
+  {
+    UINTN VariableNameSizeOld = VariableNameSize;
+    EFI_STATUS Status = gRT->GetNextVariableName(&VariableNameSize, VariableName, &VendorGuid);
+    if (Status == EFI_SUCCESS) {
+      Print(L"%g: %s\n", VendorGuid, VariableName);
+    } else if (Status == EFI_BUFFER_TOO_SMALL) {
+      VariableName = ReallocatePool(VariableNameSizeOld, VariableNameSize, VariableName);
+      if (VariableName == NULL) {
+        Print(L"Error on ReallocatePool call\n");
+        return EFI_OUT_OF_RESOURCES;
+      }
+      Status = gRT->GetNextVariableName(&VariableNameSize, VariableName, &VendorGuid);
+      if (Status == EFI_SUCCESS) {
+        Print(L"%g: %s\n", VendorGuid, VariableName);
+      } else {
+        Print(L"Error on 'gRT->GetNextVariableName' call: %s\n", Status);
+        return Status;
+      }
+    } else if (Status == EFI_NOT_FOUND) {
+      FreePool(VariableName);
+      return EFI_SUCCESS;
+    } else {
+      Print(L"Error on 'gRT->GetNextVariableName' call: %s\n", Status);
+      return Status;
+    }
+  }
+  return EFI_SUCCESS;
+}
diff --git a/Lessons/Lesson_16/UefiLessonsPkg/ListVariables/ListVariables.inf b/Lessons/Lesson_16/UefiLessonsPkg/ListVariables/ListVariables.inf
new file mode 100644
index 0000000..14e9fa2
--- /dev/null
+++ b/Lessons/Lesson_16/UefiLessonsPkg/ListVariables/ListVariables.inf
@@ -0,0 +1,19 @@
+[Defines]
+  INF_VERSION                    = 1.25
+  BASE_NAME                      = ListVariables
+  FILE_GUID                      = d66f68b2-3591-45af-bf5d-519152b9d877
+  MODULE_TYPE                    = UEFI_APPLICATION
+  VERSION_STRING                 = 1.0
+  ENTRY_POINT                    = ShellCEntryLib
+
+[Sources]
+  ListVariables.c
+
+[Packages]
+  MdePkg/MdePkg.dec
+
+[LibraryClasses]
+  UefiApplicationEntryPoint
+  UefiLib
+  ShellCEntryLib
+
diff --git a/Lessons/Lesson_16/UefiLessonsPkg/MemoryInfo/MemoryInfo.c b/Lessons/Lesson_16/UefiLessonsPkg/MemoryInfo/MemoryInfo.c
new file mode 100644
index 0000000..8c3bcf2
--- /dev/null
+++ b/Lessons/Lesson_16/UefiLessonsPkg/MemoryInfo/MemoryInfo.c
@@ -0,0 +1,215 @@
+#include <Library/UefiBootServicesTableLib.h>
+#include <Library/UefiLib.h>
+
+// for SetMem
+#include <Library/BaseMemoryLib.h>
+
+#include <Protocol/ShellParameters.h> 
+
+const CHAR16 *memory_types[] = { 
+    L"EfiReservedMemoryType", 
+    L"EfiLoaderCode", 
+    L"EfiLoaderData", 
+    L"EfiBootServicesCode", 
+    L"EfiBootServicesData", 
+    L"EfiRuntimeServicesCode", 
+    L"EfiRuntimeServicesData", 
+    L"EfiConventionalMemory", 
+    L"EfiUnusableMemory", 
+    L"EfiACPIReclaimMemory", 
+    L"EfiACPIMemoryNVS", 
+    L"EfiMemoryMappedIO", 
+    L"EfiMemoryMappedIOPortSpace", 
+    L"EfiPalCode",
+    L"EfiPersistentMemory",
+    L"EfiMaxMemoryType"
+};
+
+
+const CHAR16 *memory_types_OS_view[] = { 
+    L"reserved", // L"EfiReservedMemoryType", 
+    L"usable",   // L"EfiLoaderCode", 
+    L"usable",   // L"EfiLoaderData", 
+    L"usable",   // L"EfiBootServicesCode", 
+    L"usable",   // L"EfiBootServicesData", 
+    L"reserved", // L"EfiRuntimeServicesCode", 
+    L"reserved", // L"EfiRuntimeServicesData", 
+    L"usable",   // L"EfiConventionalMemory", 
+    L"reserved", // L"EfiUnusableMemory", 
+    L"ACPI data",// L"EfiACPIReclaimMemory", 
+    L"ACPI NVS", // L"EfiACPIMemoryNVS", 
+    L"reserved", // L"EfiMemoryMappedIO", 
+    L"reserved", // L"EfiMemoryMappedIOPortSpace", 
+    L"reserved", // L"EfiPalCode",
+    L"usable",   // L"EfiPersistentMemory",
+    L"usable",   // L"EfiMaxMemoryType"
+};
+
+
+const CHAR16 * 
+memory_type_to_str(UINT32 type) 
+{ 
+    if (type > sizeof(memory_types)/sizeof(CHAR16 *)) 
+        return L"Unknown"; 
+
+    return memory_types[type]; 
+}
+
+const CHAR16 *
+memory_type_to_str_OS_view(UINT32 type)
+{
+    if (type > sizeof(memory_types_OS_view)/sizeof(CHAR16 *)) 
+        return L"Unknown"; 
+
+    return memory_types_OS_view[type]; 
+}
+
+#define ATTRIBUTE_STR_SIZE 50
+
+#define CHECK_EFI_MEMORY_ATTRIBUTE(attr) if (attrs & EFI_MEMORY_##attr) { \
+                                           StrCpyS(&str[i], ATTRIBUTE_STR_SIZE, L" "#attr); \
+                                           i+=StrLen(L" "#attr); \
+                                         }
+
+const CHAR16 *
+memory_attrs_to_str(CHAR16* str, UINT64 attrs)
+{
+  int i=0;
+  SetMem((VOID *)str, sizeof(str), 0);
+
+  CHECK_EFI_MEMORY_ATTRIBUTE(UC)
+  CHECK_EFI_MEMORY_ATTRIBUTE(WC)
+  CHECK_EFI_MEMORY_ATTRIBUTE(WT)
+  CHECK_EFI_MEMORY_ATTRIBUTE(WB)
+  CHECK_EFI_MEMORY_ATTRIBUTE(UCE)
+  CHECK_EFI_MEMORY_ATTRIBUTE(WP)
+  CHECK_EFI_MEMORY_ATTRIBUTE(RP)
+  CHECK_EFI_MEMORY_ATTRIBUTE(XP)
+  CHECK_EFI_MEMORY_ATTRIBUTE(NV)
+  CHECK_EFI_MEMORY_ATTRIBUTE(MORE_RELIABLE)
+  CHECK_EFI_MEMORY_ATTRIBUTE(RO)
+  CHECK_EFI_MEMORY_ATTRIBUTE(SP)
+  CHECK_EFI_MEMORY_ATTRIBUTE(CPU_CRYPTO)
+  CHECK_EFI_MEMORY_ATTRIBUTE(RUNTIME)
+
+  return str;
+}
+
+EFI_STATUS
+EFIAPI
+UefiMain (
+  IN EFI_HANDLE        ImageHandle,
+  IN EFI_SYSTEM_TABLE  *SystemTable
+  )
+{
+  UINTN MemoryMapSize = 0;
+  EFI_MEMORY_DESCRIPTOR* MemoryMap = NULL;
+  UINTN MapKey;
+  UINTN DescriptorSize;
+  UINT32 DescriptorVersion;
+
+  EFI_STATUS Status;
+
+
+  EFI_SHELL_PARAMETERS_PROTOCOL* ShellParameters;
+
+  Status = gBS->HandleProtocol(
+    ImageHandle,
+    &gEfiShellParametersProtocolGuid,
+    (VOID **) &ShellParameters
+  );
+
+  BOOLEAN full=FALSE;
+  if (Status == EFI_SUCCESS) {
+    if (ShellParameters->Argc == 2) {
+      if (!StrCmp(ShellParameters->Argv[1], L"full")) {
+        full=TRUE;
+      }
+    }
+  }
+
+
+  Status = gBS->GetMemoryMap(
+        &MemoryMapSize,
+        MemoryMap,
+        &MapKey,
+        &DescriptorSize,
+        &DescriptorVersion
+  );
+
+  if (Status == EFI_BUFFER_TOO_SMALL) {
+    Status = gBS->AllocatePool(
+          EfiBootServicesData,
+          MemoryMapSize,
+          (void**)&MemoryMap
+    );
+
+    if (EFI_ERROR(Status)) {
+      Print(L"AllocatePool error: %r\n", Status);
+      return Status;
+    }
+
+    Status = gBS->GetMemoryMap(
+          &MemoryMapSize,
+          MemoryMap,
+          &MapKey,
+          &DescriptorSize,
+          &DescriptorVersion
+    );
+
+    if (!EFI_ERROR(Status))
+    {
+      EFI_MEMORY_DESCRIPTOR* desc = MemoryMap;
+      EFI_MEMORY_DESCRIPTOR* next_desc;
+      int i = 0;
+      while ((UINT8 *)desc < (UINT8 *)MemoryMap + MemoryMapSize) {
+        UINTN PAGE_SIZE = 4096;
+        UINTN mapping_size =(UINTN) desc->NumberOfPages * PAGE_SIZE;
+
+        UINT64 Start = desc->PhysicalStart;
+
+        next_desc = (EFI_MEMORY_DESCRIPTOR *)((UINT8 *)desc + DescriptorSize);
+        if (!full) {
+	  while ((UINT8 *)next_desc < (UINT8 *)MemoryMap + MemoryMapSize) {
+	    mapping_size =(UINTN) desc->NumberOfPages * PAGE_SIZE;
+	    if ((desc->PhysicalStart + mapping_size) == (next_desc->PhysicalStart)) {
+
+              if (desc->Type != next_desc->Type) {
+                if (StrCmp(memory_type_to_str_OS_view(desc->Type), 
+                           memory_type_to_str_OS_view(next_desc->Type)))
+                  break;
+                }
+
+                desc=next_desc;
+	        next_desc = (EFI_MEMORY_DESCRIPTOR *)((UINT8 *)next_desc + DescriptorSize);
+	    } else {
+	        break;
+	    }
+	  }
+        }
+
+        if (full) {
+          CHAR16 str[ATTRIBUTE_STR_SIZE];
+          Print(L"[#%02d] Type: %s  Attr: %s\n", i++, 
+            memory_type_to_str(desc->Type), memory_attrs_to_str(str, desc->Attribute));
+          Print(L"      Phys: %016llx-%016llx\n", Start, Start + mapping_size - 1);
+        }
+        else {
+          Print(L" [mem: %016llx-%016llx] %s\n", Start, desc->PhysicalStart + mapping_size - 1,
+            memory_type_to_str_OS_view(desc->Type) );
+        }
+
+        desc = next_desc;
+      }
+
+      gBS->FreePool(MemoryMap);
+    } else {
+      Print(L"GetMemoryMap with buffer error: %r\n", Status);
+    }
+  } else {
+    Print(L"GetMemoryMap without buffer error: %r\n", Status);
+  }
+
+  return Status;
+}
+
diff --git a/Lessons/Lesson_16/UefiLessonsPkg/MemoryInfo/MemoryInfo.inf b/Lessons/Lesson_16/UefiLessonsPkg/MemoryInfo/MemoryInfo.inf
new file mode 100644
index 0000000..777010d
--- /dev/null
+++ b/Lessons/Lesson_16/UefiLessonsPkg/MemoryInfo/MemoryInfo.inf
@@ -0,0 +1,21 @@
+[Defines]
+  INF_VERSION                    = 1.25
+  BASE_NAME                      = MemoryInfo
+  FILE_GUID                      = d2ce1d65-603e-4b48-b3e1-fe65d5d0bca8
+  MODULE_TYPE                    = UEFI_APPLICATION
+  VERSION_STRING                 = 1.0
+  ENTRY_POINT                    = UefiMain
+
+[Sources]
+  MemoryInfo.c
+
+[Packages]
+  MdePkg/MdePkg.dec
+
+[LibraryClasses]
+  UefiApplicationEntryPoint
+  UefiLib
+
+[Protocols]
+  gEfiShellParametersProtocolGuid
+
diff --git a/Lessons/Lesson_16/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.c b/Lessons/Lesson_16/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.c
new file mode 100644
index 0000000..7f6b58c
--- /dev/null
+++ b/Lessons/Lesson_16/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.c
@@ -0,0 +1,93 @@
+#include <Library/UefiBootServicesTableLib.h>
+#include <Library/UefiLib.h>
+
+#include <Library/MemoryAllocationLib.h>
+#include <Library/UefiRuntimeServicesTableLib.h>
+
+#include <Library/DevicePathLib.h>
+#include <Library/PrintLib.h>
+
+
+EFI_STATUS
+GetNvramVariable( CHAR16   *VariableName,
+                  EFI_GUID *VariableOwnerGuid, 
+                  VOID     **Buffer,
+                  UINTN    *BufferSize)
+{
+    UINTN Size = 0;
+    *BufferSize = 0;
+
+    EFI_STATUS Status = gRT->GetVariable(VariableName, VariableOwnerGuid, NULL, &Size, NULL);
+    if (Status != EFI_BUFFER_TOO_SMALL) {
+        Print(L"Error! 'gRT->GetVariable' call returned %r\n", Status);
+        return Status;
+    }
+
+    *Buffer = AllocateZeroPool(Size);
+    if (!Buffer) {
+        Print(L"Error! 'AllocateZeroPool' call returned %r\n", Status);
+        return EFI_OUT_OF_RESOURCES;
+    }
+
+    Status = gRT->GetVariable(VariableName, VariableOwnerGuid, NULL, &Size, *Buffer);
+    if (Status == EFI_SUCCESS) {
+        *BufferSize = Size;
+    } else {
+        FreePool( *Buffer );
+        *Buffer = NULL;
+    }
+
+    return Status;
+}
+
+
+VOID PrintBootOption(CHAR16* BootOptionName)
+{
+  UINTN OptionSize;
+  UINT8* Buffer;
+ 
+  EFI_STATUS Status = GetNvramVariable(BootOptionName, &gEfiGlobalVariableGuid, (VOID**)&Buffer, &OptionSize);
+  if (Status == EFI_SUCCESS) {
+      EFI_LOAD_OPTION* LoadOption = (EFI_LOAD_OPTION*) Buffer;
+      CHAR16* Description = (CHAR16*)(Buffer + sizeof (EFI_LOAD_OPTION));
+      UINTN DescriptionSize = StrSize(Description);
+
+      Print(L"%s\n", Description);
+      if (LoadOption->FilePathListLength != 0) {
+        VOID* FilePathList = (UINT8 *)Description + DescriptionSize;
+        CHAR16* DevPathString = ConvertDevicePathToText(FilePathList, TRUE, FALSE);
+        Print(L"%s\n", DevPathString);
+      }
+  } else {
+    Print(L"Can't get %s variable\n", BootOptionName);
+  }
+}
+
+
+INTN EFIAPI ShellAppMain(IN UINTN Argc, IN CHAR16 **Argv)
+{
+  UINTN OptionSize;
+  EFI_STATUS Status;
+
+  UINT16* BootCurrent;
+  Status = GetNvramVariable(L"BootCurrent", &gEfiGlobalVariableGuid, (VOID**)&BootCurrent, &OptionSize);
+  if (Status != EFI_SUCCESS) {
+    Print(L"Can't get BootCurrent variable\n");
+  }
+
+  UINT16* BootOrderArray;
+  Status = GetNvramVariable(L"BootOrder", &gEfiGlobalVariableGuid, (VOID**)&BootOrderArray, &OptionSize);
+  if (Status == EFI_SUCCESS) {
+    for (UINTN i=0; i<(OptionSize/sizeof(UINT16)); i++) {
+      CHAR16 BootOptionStr[sizeof("Boot####")+1];
+      UnicodeSPrint(BootOptionStr, (sizeof("Boot####")+1)*sizeof(CHAR16), L"Boot%04x", BootOrderArray[i]);
+      Print(L"%s%s\n", BootOptionStr, (BootOrderArray[i] == *BootCurrent)? L"*" : L"" );
+      PrintBootOption(BootOptionStr);
+      Print(L"\n");
+    }
+  } else {
+    Print(L"Can't get BootOrder variable\n");
+  }
+
+  return EFI_SUCCESS;
+}
diff --git a/Lessons/Lesson_16/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf b/Lessons/Lesson_16/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf
new file mode 100644
index 0000000..d2cfba9
--- /dev/null
+++ b/Lessons/Lesson_16/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf
@@ -0,0 +1,19 @@
+[Defines]
+  INF_VERSION                    = 1.25
+  BASE_NAME                      = ShowBootVariables
+  FILE_GUID                      = 31266d12-9c60-478e-905e-05d117a3a9df
+  MODULE_TYPE                    = UEFI_APPLICATION
+  VERSION_STRING                 = 1.0
+  ENTRY_POINT                    = ShellCEntryLib
+
+[Sources]
+  ShowBootVariables.c
+
+[Packages]
+  MdePkg/MdePkg.dec
+
+[LibraryClasses]
+  UefiApplicationEntryPoint
+  UefiLib
+  ShellCEntryLib
+
diff --git a/Lessons/Lesson_16/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.c b/Lessons/Lesson_16/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.c
new file mode 100644
index 0000000..b13aa6c
--- /dev/null
+++ b/Lessons/Lesson_16/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.c
@@ -0,0 +1,14 @@
+#include <Library/UefiBootServicesTableLib.h>
+#include <Library/UefiLib.h>
+
+INTN EFIAPI ShellAppMain(IN UINTN Argc, IN CHAR16 **Argv)
+{
+//  SystemTable->ConOut->OutputString(SystemTable->ConOut, L"Hello World!\n");
+  gST->ConOut->OutputString(gST->ConOut, L"Hello again!\n");
+  Print(L"Bye!\n");
+
+  for (UINTN i=Argc; i>0; i--) {
+    Print(L"Arg[%d]=%s\n", Argc-i, Argv[Argc-i]);
+  }
+  return 0;
+}
diff --git a/Lessons/Lesson_16/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf b/Lessons/Lesson_16/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
new file mode 100644
index 0000000..013bf4e
--- /dev/null
+++ b/Lessons/Lesson_16/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
@@ -0,0 +1,19 @@
+[Defines]
+  INF_VERSION                    = 1.25
+  BASE_NAME                      = SimpleShellApp
+  FILE_GUID                      = 2afd1202-545e-4f8d-b8fb-bc179e84ddc8
+  MODULE_TYPE                    = UEFI_APPLICATION
+  VERSION_STRING                 = 1.0
+  ENTRY_POINT                    = ShellCEntryLib
+
+[Sources]
+  SimpleShellApp.c
+
+[Packages]
+  MdePkg/MdePkg.dec
+
+[LibraryClasses]
+  UefiApplicationEntryPoint
+  UefiLib
+  ShellCEntryLib
+
diff --git a/Lessons/Lesson_16/UefiLessonsPkg/SimplestApp/SimplestApp.c b/Lessons/Lesson_16/UefiLessonsPkg/SimplestApp/SimplestApp.c
new file mode 100644
index 0000000..8bdf500
--- /dev/null
+++ b/Lessons/Lesson_16/UefiLessonsPkg/SimplestApp/SimplestApp.c
@@ -0,0 +1,10 @@
+EFI_STATUS
+EFIAPI
+UefiMain (
+  IN EFI_HANDLE        ImageHandle,
+  IN EFI_SYSTEM_TABLE  *SystemTable
+  )
+{
+  return EFI_SUCCESS;
+}
+
diff --git a/Lessons/Lesson_16/UefiLessonsPkg/SimplestApp/SimplestApp.inf b/Lessons/Lesson_16/UefiLessonsPkg/SimplestApp/SimplestApp.inf
new file mode 100644
index 0000000..7d4bae2
--- /dev/null
+++ b/Lessons/Lesson_16/UefiLessonsPkg/SimplestApp/SimplestApp.inf
@@ -0,0 +1,16 @@
+[Defines]
+  INF_VERSION                    = 1.25
+  BASE_NAME                      = SimplestApp
+  FILE_GUID                      = 4a298956-fbe0-47fb-ae3a-2d5a0a959a26
+  MODULE_TYPE                    = UEFI_APPLICATION
+  VERSION_STRING                 = 1.0
+  ENTRY_POINT                    = UefiMain
+
+[Sources]
+  SimplestApp.c
+
+[Packages]
+  MdePkg/MdePkg.dec
+
+[LibraryClasses]
+  UefiApplicationEntryPoint
diff --git a/Lessons/Lesson_16/UefiLessonsPkg/UefiLessonsPkg.dec b/Lessons/Lesson_16/UefiLessonsPkg/UefiLessonsPkg.dec
new file mode 100644
index 0000000..d37e955
--- /dev/null
+++ b/Lessons/Lesson_16/UefiLessonsPkg/UefiLessonsPkg.dec
@@ -0,0 +1,22 @@
+[Defines]

+  DEC_SPECIFICATION              = 0x00010005

+  PACKAGE_NAME                   = UefiLessonsPkg

+  PACKAGE_GUID                   = 7e7edbba-ca2c-4177-a3f0-d3371358773a

+  PACKAGE_VERSION                = 1.01

+

+[Includes]

+

+[LibraryClasses]

+

+[Guids]

+  # FILE_GUID as defined in UefiLessonsPkg/HelloWorld/HelloWorld.inf

+  gHelloWorldFileGuid            = {0x2e55fa38, 0xf148, 0x42d3, {0xaf, 0x90, 0x1b, 0xe2, 0x47, 0x32, 0x3e, 0x30}}

+

+[Protocols]

+

+[PcdsFeatureFlag]

+

+[PcdsFixedAtBuild]

+

+[PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx]

+

diff --git a/Lessons/Lesson_16/UefiLessonsPkg/UefiLessonsPkg.dsc b/Lessons/Lesson_16/UefiLessonsPkg/UefiLessonsPkg.dsc
new file mode 100644
index 0000000..5a3ae1c
--- /dev/null
+++ b/Lessons/Lesson_16/UefiLessonsPkg/UefiLessonsPkg.dsc
@@ -0,0 +1,36 @@
+[Defines]
+  DSC_SPECIFICATION              = 0x0001001C
+  PLATFORM_GUID                  = 3db7270f-ffac-4139-90a4-0ae68f3f8167
+  PLATFORM_VERSION               = 0.01
+  PLATFORM_NAME                  = UefiLessonsPkg
+  SKUID_IDENTIFIER               = DEFAULT
+  SUPPORTED_ARCHITECTURES        = X64
+  BUILD_TARGETS                  = RELEASE
+
+
+[LibraryClasses]
+  UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
+  UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
+  DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
+  BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
+  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
+  BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
+  RegisterFilterLib|MdePkg/Library/RegisterFilterLibNull/RegisterFilterLibNull.inf
+  PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
+  DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
+  UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
+  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
+  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
+  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
+  ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
+
+[Components]
+  UefiLessonsPkg/SimplestApp/SimplestApp.inf
+  UefiLessonsPkg/HelloWorld/HelloWorld.inf
+  UefiLessonsPkg/ImageHandle/ImageHandle.inf
+  UefiLessonsPkg/ImageInfo/ImageInfo.inf
+  UefiLessonsPkg/MemoryInfo/MemoryInfo.inf
+  UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
+  UefiLessonsPkg/ListVariables/ListVariables.inf
+  UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf
+