added most fns, weird problems
Two working branches
Merge branch 'master' of https://github.com/Battlingtoads/cleverly-deceptive