Last commit did not nice things (broke if you tried to use it)
This one will at least initialize without implosions