Rev 0.0.0.2

second commit, from local
Rev 0.0.0.3

reducing compilation errors