Meteor refactor

This is better.