Made changes to allow lazy loading via meteor
comment about the hacks