Did work on wrong branch. Doing merge magic!
Fixes for more memory efficient stuff