Added buckets for drag and drop.
Remove all "my"s from the names.