Stash my changes
Full changes, merges, now in alpha mode -- Boomer, James