Committing some implementations and updates