Commit All The Changes! A marathon coding session, need to review TODO.