Hacky fix for #14 - uses a LOT more RAM, looking for a better way to handle this