Updated with basic prototypes
Updated some templates, made a calculations page
Merge pull request #8 from 1101811b/M-Dev

M-dev