[FOLD] fixes
[FOLD] book work
[FOLD] work
[FOLD] work
[WIP] Unit Tests