WIP: Add some more in, and then try to fix the newline justification issue

Change-Id: I5fdaae6b33138c8edfb0a4c5d08f3ee8c1c5db6f