working toward getting this to compile again
now compiles and fsw installer works again