stashing
final version, I'm sort of happy with. Getting ready to merge changes