Revision 1 branch.  Working on getting it to compile
Got it to compile.  Will have to test...