WIP - newlines cause errors on Windows

Change-Id: I73afea7802e666ae5afcb56064ebc4c3cb64c2f4