Successful merge with NTF's code and rebuilt project.