Almost finished reviewing all the code. Time for a commit.