More solved problems, but some solutions are awkward, need be re-code