Solved problems, rework complete