Working temp
More work
Seems to run without crashing