Untested, backup commit; Simple partial implementation