Re-Init
ehh bug
Fixed bugs?