1) Added several TODOs
2) Tweaked World constructor slightly (commented arguments, several lines)
3) Added mapPair
4) Extended simulate function significantly