partially done buckettagging, syncing up with Matts big changes
merge