Pretty Big Commit after long