preliminary stuff working on Meteor 0.8