Started work on adding Non-Blocking I/O