Add Request Handler
Fix bugs found in unit tests. YAY!