This is my personal branch of this collaborative project.