2nd Commit. Not committing enough. More to follow.