Get commit and buildCommitMessage working, break out some functions
Rewrite and simplify