WIP: Reorganize
WIP: Trying to limit memory usage