Altered files to get them compile-ready. Still cannot compile, but is close.
no message