Fixes #22

And a better way to calc component. Also, this brings in the stepping
stone to async update instead of that ever loading loader.