Fixed project layout.
Modify the logic a bit so that we're tolerant of timing differences and exceptions.
Added some basic logging so we can see what's going on.