ISPN-3051

getting started, doesn't compile yet
3051 compilation fixes