Major rewrite and Meteor version update