Refactored a lot more. Got a different error message now, I think it's progressing.