Reffers to #32
Relates to #32 as with this commit we created something like modules for derived quantities
si