diff --git a/Project-Status.md b/Project-Status.md
index 9039f7d..80fb80f 100644
--- a/Project-Status.md
+++ b/Project-Status.md
@@ -14,9 +14,9 @@ Refer to project scope [here](https://github.com/PowerShell/Win32-OpenSSH/wiki/P
     - Validating the following key strokes behavior on multiple SSH targets - CR+LF, BS, Tab and Arrow Keys. 
 
 #### Work in pipeline
- - Unicode support in Windows: Windows APIs are typically UTF-16 based while on Unix, its UTF-8. Need to figure out a workable solution that would support both models.  
- - POSIX File API support in Windows: Currently SFTP and SCP have significant Windows differentiated code. This enables effective Unix based code usage on Windows.  
- - Code cleanup and refactoring: In entire project specific logic has been ifdef'ed and spread out at various places in the project in an attempt to achieve a workable solution on Windows. These need to be cleaned up and refactored as per OpenBSD's coding guidelines in order to get to an acceptable state. 
+ - Unicode support in Windows: Windows APIs are typically UTF-16 based while on Unix, its UTF-8. Need to figure out a workable solution that would support both models. Details [here](https://github.com/PowerShell/Win32-OpenSSH/issues/319).  
+ - POSIX File API support in Windows: Currently SFTP and SCP have significant Windows differentiated code. This enables effective Unix based code usage on Windows.  Tracked [here](https://github.com/PowerShell/Win32-OpenSSH/issues/320)
+ - Code cleanup and refactoring: In entire project specific logic has been ifdef'ed and spread out at various places in the project in an attempt to achieve a workable solution on Windows. These need to be cleaned up and refactored as per OpenBSD's coding guidelines in order to get to an acceptable state. Tracked [here] (https://github.com/PowerShell/Win32-OpenSSH/issues?q=is%3Aopen+is%3Aissue+label%3A%22Area-Code+Cleanup%22)
  - Syncing Win32 fork with the latest changes from OpenSSH main repo.
  - SAL annotate Win32 specific code. Run static analysis.
  - Fix bugs to be addressed for this [milestone](https://github.com/PowerShell/Win32-OpenSSH/milestone/1).