A work in progress... intended for Meteor 0.8.3