Initial commit pt II
Merge https://github.com/tonycrab/fun