moved bean
Merge branch 'master' of https://github.com/aliceliu/TBD
linked map, minor cleanup
reverted