Temporary commit, partial solution in place