And now it compiles..    Had to rush in the commit from another computer so I could get some work done!