checkpoint
moving storage handle from static property to static var (it's doing that thing that shouldn't be possible again)
checkpoint