wip

* Upped memory
* Better logging
* Refactor