fix crash
stuff
stashing work