okay all the reverting and some moving forward and it compiles.

now on to merging the lib back into the source