stashing changes
stashing changes
Fixed up some orb state stuff
virtual move and helper functions