All the buggy code
15418
Merge branch 'master' of github.com:PeterJWei/15418