Calculations, partials

Moved tabels into partials, created basic calculations