Final commits for coderfaire