Pulling out changes file till later.
Cleaning up syntax.