Reverting back line ending.
Removing commented code, getting demo to compile.