- WIP - not compiling
- Memory improved

Signed-off-by: Gleb Aronsky <gleb.aronsky@lexisnexis.com>